More header sorting.

diff --git a/filter_vecs.cc b/filter_vecs.cc
index 4153efae1615ba6797a73d69847884ac14787ff8..f4568f0006fe24c9ca53190bda920dd6f5417ad1 100644 (file)
--- a/filter_vecs.cc
+++ b/filter_vecs.cc
@@ -24,8 +24,8 @@
 #include "gbversion.h"
 #include "inifile.h"
 #include <QtCore/QStringList>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstdlib> // qsort
 
 typedef struct {

diff --git a/g7towin.cc b/g7towin.cc
index 72bf9b35179b9d0efaf99907f2939ce50e03fa42..ae673c88aa64b3f265c835ff853eb64a6d5c31df 100644 (file)
--- a/g7towin.cc
+++ b/g7towin.cc
@@ -34,7 +34,7 @@
 
 #include <cstdlib>
 #include <ctime>
-#include <stdio.h>
+#include <cstdio>
 
 #if CSVFMTS_ENABLED
 

diff --git a/garmin_tables.h b/garmin_tables.h
index 8f2b13b9f445ed0a4135f732d634baf2dcf49c69..21e7e08625e5e9599c6cdf86de60ae85b7759e5a 100644 (file)
--- a/garmin_tables.h
+++ b/garmin_tables.h
@@ -28,7 +28,7 @@
 #define DEFAULT_ICON_DESCR "Waypoint"
 #define DEFAULT_ICON_VALUE 18
 
-typedef struct icon_mapping {
+typedef const struct icon_mapping {
   const int mpssymnum;
   const int pcxsymnum;
   const char* icon;

diff --git a/lowranceusr.cc b/lowranceusr.cc
index a1087c7953f4d019a29b48fe0e1bb4514c30c293..610c6f7370b459f17b7be486b9e99a12c381c491 100644 (file)
--- a/lowranceusr.cc
+++ b/lowranceusr.cc
@@ -35,8 +35,8 @@
 #include "defs.h"
 #include <QtCore/QDebug>
 #include <cmath> /* for lat/lon conversion */
+#include <cstdio>
 #include <cstdlib> // atoi
-#include <stdio.h>
 
 typedef struct lowranceusr_icon_mapping {
   const int    value;